From: Keir Fraser Date: Thu, 11 Sep 2008 14:17:31 +0000 (+0100) Subject: x86, shadow: Fix some SHADOW_PRINTK() callers. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14111^2~3 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=73ac5efa28d3d404ab5224057081acaa9cdfd3ef;p=xen.git x86, shadow: Fix some SHADOW_PRINTK() callers. Signed-off-by: Yoshi Tamura --- diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index be3afbba3e..c6bbc73086 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -715,8 +715,8 @@ static void _sh_resync(struct vcpu *v, mfn_t gmfn, & ~SHF_L1_ANY)); ASSERT(!sh_page_has_multiple_shadows(mfn_to_page(gmfn))); - SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, va=%lx\n", - v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), va); + SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n", + v->domain->domain_id, v->vcpu_id, mfn_x(gmfn)); /* Need to pull write access so the page *stays* in sync. */ if ( oos_remove_write_access(v, gmfn, fixup) ) @@ -970,8 +970,8 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn) ASSERT(shadow_locked_by_me(v->domain)); - SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx va %lx\n", - v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), va); + SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n", + v->domain->domain_id, v->vcpu_id, mfn_x(gmfn)); pg = mfn_to_page(gmfn); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 6d16628b5c..2bdc1681cb 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -3179,7 +3179,7 @@ static int sh_page_fault(struct vcpu *v, SHADOW_PRINTK("d:v=%u:%u va=%#lx err=%u, rip=%lx\n", v->domain->domain_id, v->vcpu_id, va, regs->error_code, - regs->rip); + regs->eip); perfc_incr(shadow_fault);